Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch main branch in grizzly #11

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

pzygielo
Copy link
Contributor

@pzygielo pzygielo commented Dec 7, 2024

Target of some latest PRs, like

suggests that main is the new default branch in repository.

@anajosep, please check and approve or reject this PR.
Or perhaps @arjantijms or @pnicolucci could do that as well.

@pzygielo pzygielo requested a review from a team as a code owner December 7, 2024 20:40
@pzygielo pzygielo requested a review from anajosep December 7, 2024 20:40
@netomi
Copy link
Contributor

netomi commented Dec 8, 2024

/otterdog validate

Copy link

This is your friendly self-service bot.
Please find below the validation of the requested configuration changes:

Diff for 9932307
Project ee4j[github_id=eclipse-ee4j]
!                                                                                                             
! Warning:   repository[name="jersey.github.io"] has 'gh_pages_build_type' with value 'workflow', but no      
!            corresponding 'github-pages' environment, please add such an environment.                        
!                                                                                                             
  there have been 85 validation infos, enable verbose output to display them.

  
!   repository[name="grizzly"] {
!     default_branch = "master" -> "main"
!   }

-  remove branch_protection_rule[pattern="master", repository=grizzly] {
-    allows_deletions                  = false
-    allows_force_pushes               = false
-    blocks_creations                  = false
-    bypass_force_push_allowances      = []
-    bypass_pull_request_allowances    = []
-    dismisses_stale_reviews           = false
-    is_admin_enforced                 = false
-    lock_allows_fetch_and_merge       = false
-    lock_branch                       = false
-    pattern                           = "master"
-    require_last_push_approval        = false
-    required_approving_review_count   = 1
-    requires_code_owner_reviews       = false
-    requires_commit_signatures        = false
-    requires_conversation_resolution  = false
-    requires_deployments              = false
-    requires_linear_history           = false
-    requires_pull_request             = true
-    requires_status_checks            = false
-    restricts_pushes                  = false
-    restricts_review_dismissals       = false
-  }

+  add branch_protection_rule[pattern="main", repository=grizzly] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = false
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "main"
+    require_last_push_approval        = false
+    required_approving_review_count   = 1
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = false
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }
  
  Plan: 1 to add, 1 to change, 1 to delete.

@netomi
Copy link
Contributor

netomi commented Dec 8, 2024

/otterdog check-sync

Copy link

This is your friendly self-service bot. The current configuration is in-sync with the live settings. 🚀

@netomi
Copy link
Contributor

netomi commented Dec 8, 2024

/otterdog team-info

Copy link

This is your friendly self-service bot.

The author (pzygielo) of this PR is associated with this organization in the role of MEMBER.

Additionally, pzygielo is a member of the following teams:

Copy link
Contributor

@netomi netomi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pzygielo
Copy link
Contributor Author

@pnicolucci
Copy link

This looks fine to me, seeing the last commit to master was over a year ago: https://github.com/eclipse-ee4j/grizzly/commits/master and main contains all the latest commits https://github.com/eclipse-ee4j/grizzly/commits/main

@pnicolucci
Copy link

One note, is that master still looks to be the default branch: https://github.com/eclipse-ee4j/grizzly/branches/all

I don't know who has access to change that, is that something the committer team needs to bring up some place to get updated?

@pnicolucci
Copy link

@arjantijms any comments?

@pnicolucci pnicolucci self-requested a review December 12, 2024 16:37
@pnicolucci
Copy link

I just think we should be consistent here if we update the default branch to main we should ensure it is actually set as the default branch in the grizzly project :)

@pzygielo
Copy link
Contributor Author

pzygielo commented Dec 12, 2024

One note, is that master still looks to be the default branch: https://github.com/eclipse-ee4j/grizzly/branches/all

This PR is for that - to change it. Not to rename. master will be left as is and existing main will be the default one.

I don't know who has access to change that, is that something the committer team needs to bring up some place to get updated?

We have the access to change that, here with this PR. It's the matter of merging this, and EF magic will propagate change to repository.

I'd like to see comments from grizzly team to reject or accept it. I'm not part of grizzly team myself, and have no idea if using main in grizzly repository was discussed anywhere else. That's why I'm waiting for comments.

I just think we should be consistent here if we update the default branch to main we should ensure it is actually set as the default branch in the grizzly project :)

This PR is about changing default branch to the existing main in grizzly repository only. What do you mean by the grizzly project? All other repositories?

For similar to happen there - committer can create new branch of current master (not me). And then change default branch to new one - with PR here.

It's unclear for me why some PRs went to new main in grizzly in first place.

@pnicolucci
Copy link

@pzygielo, thank you for the explanation this all makes sense to me now. I'm not sure who created the main branch so we can wait for additional feedback as to why it was created and if it should be the default.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants